Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:02:16 +0000 (16:02 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:02:16 +0000 (16:02 -0400)
commit592842dfa8a242b6559c306ccc736673ffd62124
tree259fb6ae89a56597ea6f0af7dbcd22288142f1af
parent03c9fd6f0585a54a69e676bcb9ddb56295ffce03
parentaa6dcf51312341ae0c18e30b494d3b4b1f2cce86
Merge changes from emacs-23 branch.
16 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
leim/ChangeLog
lisp/ChangeLog
lisp/emacs-lisp/easy-mmode.el
lisp/files.el
lisp/ido.el
lisp/menu-bar.el
lisp/progmodes/make-mode.el
lisp/simple.el
lisp/subr.el
lisp/woman.el
src/ChangeLog
src/doc.c
src/eval.c
src/s/hpux10-20.h